[14.0][IMP] shopfloor: package checkout buttons #665

raumschmiede-joshuaL · 2023-06-27T13:45:32Z

Adds a menu config to allow/disallow the usage of packages

OCA-git-bot · 2023-06-27T13:45:36Z

Hi @guewen, @sebalix, @simahawk,
some modules you are maintaining are being modified, check this out!

raumschmiede-joshuaL · 2023-06-27T13:47:08Z

@mt-software-de and @jbaudoux , can also be reviewed by one of you

mt-software-de

This is great. Thanks.
Maybe you could rename your new created methods for a better understanding.

mt-software-de · 2023-06-27T18:53:56Z

shopfloor/data/shopfloor_scenario_data.xml

@@ -43,7 +43,8 @@
 {
    "no_prefill_qty": true,
    "show_oneline_package_content": true,
-    "auto_post_line": true
+    "auto_post_line": true,
+    "package_process_type": true


You have to add a migration for this change as well.
`import json
from odoo import SUPERUSER_ID, api

def post_init_hook(cr, registry):
env = api.Environment(cr, SUPERUSER_ID, {})
scenario = env.ref("shopfloor.scenario_checkout")
options = scenario.options
options["package_process_type"] = True
scenario.options_edit = json.dumps(options)
`

mt-software-de · 2023-06-27T19:49:16Z

shopfloor/services/checkout.py

+    def _get_allow_package_options(self):
+        if not self.work.menu.package_process_type:
+            return True, True
+
+        if self.work.menu.package_process_type == "with_package":
+            return True, False
+
+        return False, True
+


I think we should split this into two separate methods. This would simplify the code later.

Suggested change

def _get_allow_package_options(self):

if not self.work.menu.package_process_type:

return True, True

if self.work.menu.package_process_type == "with_package":

return True, False

return False, True

def _is_process_with_package_enabled(self):

if not self.work.menu.package_process_type:

return True

if self.work.menu.package_process_type == "with_package":

return True

return False

def _is_process_without_package_enabled(self):

if not self.work.menu.package_process_type:

return True

if self.work.menu.package_process_type == "without_package":

return True

return False

mt-software-de · 2023-06-27T19:49:34Z

shopfloor/services/checkout.py

@@ -83,19 +83,28 @@ def _response_for_manual_selection(self, message=None):
        return self._response(next_state="manual_selection", data=data, message=message)

    def _response_for_select_package(self, picking, lines, message=None):
+        with_pack, wo_pack = self._get_allow_package_options()


Suggested change

with_pack, wo_pack = self._get_allow_package_options()

mt-software-de · 2023-06-27T19:51:16Z

shopfloor/services/checkout.py

+                "allow_with_package": with_pack,
+                "allow_without_package": wo_pack,


Suggested change

"allow_with_package": with_pack,

"allow_without_package": wo_pack,

"allow_with_package": self._is_process_with_package_enabled(),

"allow_without_package": self._is_process_with_package_enabled(),

The second one should be _is_process_without_package_enabled, right?

mt-software-de · 2023-06-27T20:06:01Z

shopfloor/services/checkout.py

+    def _check_scan_package_find_result(self, search_result):
+        ppt = self.work.menu.package_process_type
+        # Currently there is no known way to finish the checkout with a scan. To
+        # process without any package is only possible with a button. In its def
+        # a BadRequest is raised in case no package is not allowed
+        if not ppt or ppt == "with_package":
+            return
+
+        stype = search_result.type
+
+        if ppt == "without_package" and stype in [
+            "package",
+            "packaging",
+            "delivery_packaging",
+        ]:
+            return self.msg_store.invalid_scanned_checkout_object_wo_package(stype, ppt)
+


Could you please add a docstring and rename this method.

Suggested change

def _check_scan_package_find_result(self, search_result):

ppt = self.work.menu.package_process_type

# Currently there is no known way to finish the checkout with a scan. To

# process without any package is only possible with a button. In its def

# a BadRequest is raised in case no package is not allowed

if not ppt or ppt == "with_package":

return

stype = search_result.type

if ppt == "without_package" and stype in [

"package",

"packaging",

"delivery_packaging",

]:

return self.msg_store.invalid_scanned_checkout_object_wo_package(stype, ppt)

def _is_package_scan_allowed(self, search_result):

if self._is_process_with_package_enabled():

return

package_process_type = self.work.menu.package_process_type

if package_process_type == "without_package" and search_result.type in [

"package",

"packaging",

"delivery_packaging",

]:

return self.msg_store.checkout_package_scan_is_not_allowed(search_result.type, package_process_type)

mt-software-de · 2023-06-27T20:12:26Z

shopfloor/actions/message.py

+    def invalid_scanned_checkout_object_wo_package(
+        self, scanned_object, package_process_type
+    ):
+        scanned_object_name = {
+            "package": _("a package"),
+            "packaging": _("a packaging"),
+            "delivery_packaging": _("a delivery packaging"),
+        }.get(scanned_object, _("N/A"))
+
+        selection = self.env["shopfloor.menu"]._fields["package_process_type"].selection
+        ppt_name = None
+        for el in selection:
+            if el[0] == package_process_type:
+                ppt_name = el[1]
+                break
+
+        return {
+            "message_type": "error",
+            "body": _(
+                "You scanned {scanned_object_name} which is not allowed"
+                " with the package process type '{ppt_name}'"
+            ).format(scanned_object_name=scanned_object_name, ppt_name=ppt_name),
+        }


Could you rename this to checkout_package_scan_is_not_allowed

Suggested change

def invalid_scanned_checkout_object_wo_package(

self, scanned_object, package_process_type

):

scanned_object_name = {

"package": _("a package"),

"packaging": _("a packaging"),

"delivery_packaging": _("a delivery packaging"),

}.get(scanned_object, _("N/A"))

selection = self.env["shopfloor.menu"]._fields["package_process_type"].selection

ppt_name = None

for el in selection:

if el[0] == package_process_type:

ppt_name = el[1]

break

return {

"message_type": "error",

"body": _(

"You scanned {scanned_object_name} which is not allowed"

" with the package process type '{ppt_name}'"

).format(scanned_object_name=scanned_object_name, ppt_name=ppt_name),

}

def checkout_package_scan_is_not_allowed(

self, scanned_object, package_process_type

):

scanned_object_name = {

"package": _("a package"),

"packaging": _("a packaging"),

"delivery_packaging": _("a delivery packaging"),

}.get(scanned_object, _("N/A"))

selection = self.env["shopfloor.menu"]._fields["package_process_type"].selection

ppt_name = None

for el in selection:

if el[0] == package_process_type:

ppt_name = el[1]

break

return {

"message_type": "error",

"body": _(

"You scanned {scanned_object_name} which is not allowed"

" with the package process type '{ppt_name}'"

).format(scanned_object_name=scanned_object_name, ppt_name=ppt_name),

}

mt-software-de · 2023-06-27T20:13:06Z

shopfloor/services/checkout.py

@@ -913,11 +922,37 @@ def scan_package_action(self, picking_id, selected_line_ids, barcode):

        selected_lines = self.env["stock.move.line"].browse(selected_line_ids).exists()
        search_result = self._scan_package_find(picking, barcode)
+
+        message = self._check_scan_package_find_result(search_result)


Suggested change

message = self._check_scan_package_find_result(search_result)

message = self._is_package_scan_allowed(search_result)

jbaudoux · 2023-06-28T07:35:46Z

shopfloor/models/shopfloor_menu.py

+    package_process_type_is_possible = fields.Boolean(
+        compute="_compute_package_process_type_is_possible"
+    )
+    package_process_type = fields.Selection(
+        [
+            ("without_package", "Without Package"),
+            ("with_package", "With Package"),
+        ],
+        "Package Proccess Type",
+    )


It would be nice to move the configuration to the picking type in a separate module e.g. stock_picking_putinpack_restriction in stock-logistics-workflow and handle the "put in pack" button according to the chosen option. Options similar to https://github.com/OCA/stock-logistics-warehouse/blob/14.0/stock_location_package_restriction/models/stock_location.py#L14

raumschmiede-joshuaL · 2023-07-05T11:52:35Z

Suggested changes make sense, they will be implemented later in the future

jbaudoux · 2023-09-18T13:15:02Z

shopfloor/services/checkout.py

+
+        if ppt == "without_package" and stype in [
+            "package",
+            "packaging",


Suggested change

"packaging",

packaging is a product packaging. This must be allowed

jbaudoux

Product packaging can't be scanned anymore

TDu · 2023-11-17T16:12:39Z

To follow on this comment in the PR https://github.com/OCA/wms/pull/665/files#r1244810564
I have created the following:

This one should be closed...

[14.0][IMP] shopfloor: package checkout buttons

8c01934

Adds a menu config to allow/disallow the usage of packages

mt-software-de suggested changes Jun 27, 2023

View reviewed changes

jbaudoux reviewed Jun 28, 2023

View reviewed changes

jbaudoux reviewed Sep 18, 2023

View reviewed changes

jbaudoux requested changes Sep 18, 2023

View reviewed changes

TDu mentioned this pull request Nov 17, 2023

[14.0][ADD] shopfloor_checkout_putinpack_restriction #783

Merged

jbaudoux closed this Nov 21, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[14.0][IMP] shopfloor: package checkout buttons #665

[14.0][IMP] shopfloor: package checkout buttons #665

raumschmiede-joshuaL commented Jun 27, 2023

OCA-git-bot commented Jun 27, 2023

raumschmiede-joshuaL commented Jun 27, 2023

mt-software-de left a comment

mt-software-de Jun 27, 2023

mt-software-de Jun 27, 2023

mt-software-de Jun 27, 2023

mt-software-de Jun 27, 2023

JuMiSanAr Sep 5, 2023

mt-software-de Jun 27, 2023

mt-software-de Jun 27, 2023

mt-software-de Jun 27, 2023

jbaudoux Jun 28, 2023 •

edited

Loading

raumschmiede-joshuaL commented Jul 5, 2023

jbaudoux Sep 18, 2023

jbaudoux left a comment

TDu commented Nov 17, 2023 •

edited

Loading

		"allow_with_package": with_pack,
		"allow_without_package": wo_pack,

	message = self._check_scan_package_find_result(search_result)
	message = self._is_package_scan_allowed(search_result)

[14.0][IMP] shopfloor: package checkout buttons #665

[14.0][IMP] shopfloor: package checkout buttons #665

Conversation

raumschmiede-joshuaL commented Jun 27, 2023

OCA-git-bot commented Jun 27, 2023

raumschmiede-joshuaL commented Jun 27, 2023

mt-software-de left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jbaudoux Jun 28, 2023 • edited Loading

Choose a reason for hiding this comment

raumschmiede-joshuaL commented Jul 5, 2023

Choose a reason for hiding this comment

jbaudoux left a comment

Choose a reason for hiding this comment

TDu commented Nov 17, 2023 • edited Loading

jbaudoux Jun 28, 2023 •

edited

Loading

TDu commented Nov 17, 2023 •

edited

Loading